I think this should be moved down to where it was before; I think there are side-effects to moving this