updating to work with user id in