New loop approach tested and seems to work ok.