Try some performance improvements