Marian's changes from the ZIP file.