Added user names, but not quite working