[ok] working new-style completion