bib lib updated
report updated
code refacotrized