This is much better indeed. The idea of the patch is awesome!