Tom added a Timer stop
Changed to Pedro's map