Finalized 3.0 version