More copies and more minor style changes