Chimera changes for new ACL system