Completed some final OTP parts