Reorganizing and adding tags.