added alfayhaa  and suroyo