Added timer feature