many changes made, models profile and user adjusted