Tweaks to Glider - Not verified