added tag and more