added diablo, added &