Sumada Kaabaha: optimizations