Improved looping.