Updated usercontrol