Adding more trapping.