I think this is the perforamce issue #2