some changes to mockup