Some changes on Control