Made an important optimization