fail safe changes, added comments for fail safe