Back to init, fixing branches