Additional changes for baseline