updated and beautified o3o