Changes for performance. Need to be validated against previous version
Looks good.