first revisions, fixes #1