improve s:complete