uploading John's changes