TCS3420-3545

Enforced returns