Slowing improving accuracy for #10

However, this code is not utilized yet. [ci skip]