Altered response and removed forEach's