some more edits in looping