Still seing the bug, but with better perfs
Fair scaffolding