Merge Erik's changes into my branch