changed rounding
merged