continued working on new saddle calculation optimizations. Disabled for this commit.