changed everything back to kosher state for pull request