Moved timer to correct place