save refactoring / comments
changes to startup of hybrid/plan operations