Updated completions, should be more reliable now