added tag and clean