furhter updates for SPN edits.