[ci skip] refactor for speeeeeed. down to ~3s from ~13s