Updated some calculations to use Floating Point numbers