changed to diff_funcs branch and committing functionality once again