Added updated versions for OtO and FB