Version 2.0 finalised