Chemisist optimizations from 7d7f9fff72e4ce14ecd663570d1362b354cb17f7