Updated mockup again