updates to deal with completion problems;