Added in Uyen's Changes