made same changes to dev branch