RF: Further optimizations