Updated timing functions

Got rid of 'ghetto timers’, thanks Alex