Updated New Tag flow