More observer/notification changes