updated completion rules