removed :name references and replaced with :username