this is the stuff I changed. Made user model which would be more informative