Added optimizing