Changed getDiff mechanism