Updates to lw_heap