some changes for enrolled