More SGPstateData updates for NM/ABQ