Completeor improvements