Updated with Comps