Review changes. Using fireEvent for legend updates