some changes on control