Updateed user functions