Changed to use numpy instead of Numeric