Made changes, see email for explanation.