improve timing handling