Refactoring
Deep observer upgraded