Added in all of Shafae's changes