Re: comps changes for f15