Control optimization and some settings added