Legacy Mode & EoC Improvements Progress!