new stuff from book
copy-files.. remove deprecated constructs