Some more cp fix (STILL UNPLAYABLE!)