Initial commit for forked version