More comps updates