small changes. oo conversion completed