Sumada Kaabaha: optimize performance