Wise choice Gerard. After another failure with this machine, I was offered a replacement a few weeks ago to a 2017 model (as the 2016 one is obviously not produced anymore). But because of their slowness in sorting it out, combined with the realisation the 2018 model will be out soon and hopefully will fix some of these issues (for a start I think they have improved the keyboard), made me decline and take a full refund.