Removed hardcoded CP points. Somehow, made the code broken?