removed users, added name fields