Improved user updating code