always try to work in a branch (needs further cleanup)