Landed some optimizations