Initial changes for Gummy.