implementing changes to PEER spec.