fix and add auto cps