Improved how 'Mode' works.