small changes wrt timer functionalty