This somewhat adaptive version is doing much better!