add Igor's performance updates