ASSIST-80 - Reorganized top of User model.