initial changes in light of @seancribbs comments