added mainFull block
fixed merge