Added a can_take before filter for diagnostics