More work on 2.0