Adding editing/tag code