replaced deprecated tags