Modification to tagging