New Tags and some modif