improved branch is in, version 1 ready