tolerance adjusted
merge conflict fixed