added tag creation to all units