Many Thanks to Mark Williams which do the most of the new things added in 3.6

Enjoy