Snapengage Fix

Updated snap engage code to work consistently