WIP: Aroma update