Updated for new data fields and removed labels code to tidy