Updated both for legend fix