Final Changes for Comp