Final commit to get 2.0 up to old condition