OTP-1 missing stuff 

More updates