Added start and stop hours to data
Improved fitness