done with lab 6.1
merging modeling users with master