lots of changes, just before a branch