updated timer stuff