WIP need to check all this about double tagging