speed up efforts
resolved conflicts after merge
speedup version that actually works.