improvementd to OTP