initial tagging support take 2