Added emty value checks and rounding to 3 decimal places