Additional changes for previous commit