incorporate changes/simplifications based on discussion with jnthn++ last week