v2 stuff still broken