Added Category name
added some changes
merged changes