Updated Comp 98