This should be removed once the other changes are made