sync with changes from sentosaseminyak