Updating the ACP stuff for easier coding