updated Update and Escape Functions