modifications to make more cp-like