Added limit to iterate