Updated toDouble