Changes requested by @plumpNation and @AdiChi