Updates to conform to PEPS