Added refactored version of Oo.php