Find and Catch update