Added user edition - small improvements to be done