integrated mockup with the branch
#104: done