edits, remove code rescue extemp