updated, removed the userAuth stuff