Classic Mode Improvements