Added changes from Mariah