More comps changes