Feature/acp

Are these duplicates really needed?