Little changes (18/19)

Little changes