@mjgiarlo we will need to be careful of this change, since it will have to move into scholarsphere