added more mockup logic