integrated observer-model, refactoring