Update completion to be better written.