synched code and working on tagging