Making changes Blake suggested