Modify logic of completion