Control Setup modification