revert back previous version due to dubble tags