Optimization

It works faster now.