speed optimization

speed optimization