Work on ACP improvements