reconciled some changes from prior work