Merging cpacey's new work