review this, completion should stay in