Improved more examples