Adjusting pep to match impl