Edited Schedule once again