code changes for tags...