Implemented 'OTP Slip' and some changes