first modification for integrate Kundera