added 1.2 functions and better highlighting