Fix/update completion code