performace issues

performace issues