add v3 clock
Add apparently missing v2 handling
Fix v3 require using v2 file