Removed dependency on moment
Removed dependency on moment