Add changes made by K Ernest 'iFire' Lee