FINISHED: add tag stuct remove