Spike performance improvement

WIP