Uploading Rinker's changes