More updates of NM/ABQ SGPstateData