updated time table rules to fit the OOP things