improve speed

improve speed