v2 in an attempt to get a clean repository