changed to accommodate 'username' vs 'name'