Improved user edition