Added "CATEGORY" block.
Merge conflicts.