added devise and user