General performance improvements have been implemented

General performance improvements have been implemented.