Made some performance changes.