Added to much from last CP