Merged Taylor's files with the latest working copy