Tags changes- Not yet completed