some changes with tags