Fixed time calculation
Fixed mats calculation
Mats and time calculations are now accurate