improved the loop a little