Safe update on latch design

Safe update on latch design