Little changes (17/19)

Little changes