changed the way enrollment model works...again