1.8 update

I think I promised you this a couple of years ago :)