Further changes from Kelly