Failure on several fronts implementing cython/weave versions...
Reverted to original version