initial revision after fork of the repo