code updates for categories
Merge branch 'working'