Further changes for #4