Added another tag and changed logic