switched the old autocompletion in (todo: separate code for new one?)