Legend Improvements