final changes to dev branch