should have done these performance improvements a long time ago