Sumada Kaabaha: improve performance