modified mitm for mockup
modfied some bugs
finished to code for mockup
merge mockup