Merged Nick's changes into mine