Add JustArchi's Optimizations