Improved ex 2.17