update user control system
merge