Refactored names and added to Observer
Fixed merge Conflict