Partial refactor en cliente, usa variable running