Update new tags and new function use