added usernames and whatnot