Modifications made according to new changes ...