2nd update, added users