Refactoring to add countdown
Adding countdown