updated optimizer and manager