Aroma changes + Archi's optimizations