- further refactoring for symphony