Update to 1.4.7 - still some work to do