Commented out forach to optimize call from 18 sec to 1