enhancing tags, removed debug code