added some oo
YaP is now oo friendly