Better completion implementation!