rework_user manual and include #369