Mods to OL6.5