user update functionality
Merged master fixed conflict.