some revisions, more to come...