Removing duplicated function ,adding tags