FIXED: Timer now restarts when finished