Changed from double to bigdecimal