This and the above change may need to be changed back, but not at this time