Tag revamping

Tag revamping