more enhancements
use pypy