tagging
tagging 2 and refactoring codes