Sarah: re-added Tim's legend tweaks