Initial changes to forked version