main changes, includes updated, added users_view