Merge was not done properly and removed quite a bit of code from BusSchedule, readded it.