updated to check for decimals