OTP optimization