Second addition of original code changes to fork