much better adding of tags