removed diff mode, reintegrate it to a later point