update with latest revisions to code