Using new language system; upgraded to use 1.7 features.