improve completion engin