Updated for the ACS change