changes in light of @seancribbs input