new tags and clean up