Bringing back buffering
DSL-friendly options