Further changes after discussing with Ali.