Merging Wilson's changes