Effective CPS fix, add wrinkler persistence