Added/modified stuff for mockup