Changed other tags as well