change completion argument and a looootts of thing