work on the completeness tools