edited all methods and added uid field