Updated mb_spill to work properly