Need to fix condition to pick a category