Manual scheduling added and tested