changes some things and added numexpr