Even better perf + respond to options changes.