Tweaks to OO