Switched over to Event system to drive updates.