Some minor design change