Added OI lock