Tweaked TES2 to perfection: REMEMBER THIS COMMIT!