More changes for #16