added users and modified other files