C segment; updates to O and P segments