Switch to repeater

It could be better done, but it was better than the previous inline thing