FIX: seems like i fixed the time thing