restructring so I can loop and update text