Added this, along with making it PEP compatible