added more optimization sections