Better fix for time constraints
Fixing even more time bugs