Yes, I know that, but still I'd like to see two tickets/PRs

1. fixing ACP with copying the fixes from prosilver
2. improving readability and code clean up.