Latest working version 

Don't think I've changed anything, but can't be sure and this is working, so saving as a last working version