lots of additions. branch name is now misleading