Finalise version 2.0.0