Update according to two review comments: