removed unnecessary passing of usernames