improve loops..
fixing merge conflict