JustArchi's optimizations