Merge Greg's changes