More comp design changes