improve mock up