Add some logic about including a dot or not