modified specialized time and redid time calculations to be cleaner