rewrite block processing, inv4 git merge hell