incorporate Dan and Robb's edits