Added two more optimization points