Added check for what type of trap!