Added all observer stuff