More work on enrollment