Updated logic to account for course that takes two days