Added new optimizer (disabled for now).