Big overhaul of lemongrid to V9