initial tagging support take 4