commit leon's change
add user control