ongoing changes due to optimization update