category and symptom persisitng together
Merge origin/master