Fixing timer, Adding options for manual and destination based timers