Further changes to #2