Re-Order CAP

Re-Order CAP