Added loop instead of one per host