various revision to sync w/ changes in markup