change for optimize mode