some mOO changes