add khan as generic also