Adding the changes as dicussed