Additional changes related to last commit