Better intentation
New categories