Did the same for traps...