0421 mass massive expended fi

0421 tested fi