Added changes from ElementalX

cerdfwedfwerf