Revised trappers (#RCO)