Rework example so it is even more function subsitution friendly