Revisions from demo