Extended with possibility of detector comparison.