@matthewford updated, now just relies on data sent from the API instead of doing regex check