added back v1 special-cases