Changes by task T5