going back to 0.6 for tagging