Improves Otto implementation