Upgraded the example