Updated mockup v0.0.1