added ronn part and some extras