Latest version

Not quite sure what's in here, I made they changes ages ago