added null mass management