Some minor design change.