New shapes and branching stuff