added performace tweak