Added changes from Tyler and Stephen