some minor changes in observer