Updated the TAG statements