Update the forked version

Updating the forked version