[Run] Took @pyrech feedback into account