Nigel Tao's fixes: 18 -> 5 sec