Initial steps towards 3.0