Zero branchy

Second effort_pull request (third branch&zero-branchy)