More copy. Less cruft