Changed code according to new version
Changed code according to new version