#151 optimizations to stop outages