Tag Self-discipline improvement