More supp. added
More meth. added.
something on conflict