Reorganized automatic completion