Changes some logic, makes more sense now but cc2 fails still