Added a few things to mockup