OT code improved