update to actually use SR and PCR mappings, updated mappings to latest supervisor