Intermediate commit on improved ISU SM stuff
quell warning about NaN due to missing data