Final version for Jacek L. audit.
unresolved isue: many warnings due to no connection