Improved loop
Public