Added experimental speed-up