removed dependencies on global "numeric" variable. unit tests pass.