moved one more userspecific bit out