Updated for compliance mode