I also prefer the current one over @drak's version