Renamed Comp 1, added Comp 2