Added heart rate if present and removed state. Plz review