Upgrade examples...
Add some extra checks...