updated with new tags