perfotmance improvments