Yes changes (14/16)

Yes changes