Tagging added and tested