switched function to dev-branch