Merge all Scott's changes