Removed rounding and old function