Updated categories to tags
Updated to use tags