fix name and add shaberu