modified to use pyteaser orig