performance improvements :running::running::running: