made changes to forked version