Refactored and added timer