now with correct timer