added preenroll_only functionality