Additional speed-up added.