Optim pass + new comments