Removed dependency on math