Cleaing up timer
Cleaned up merge