More work on v2.0