Update Observer

--update the observer class a little bit