Little changes (16/19)

Little changes