20110606 unknown: Salman; Himesh patch up