Version 2.0

Examples adapted to version 2.0