Pyon recoded with an emphasis on TDD