Changes up to mockup