Yes changes (10/16)

Yes changes