Setting up to date stuff

Trying to avoid conflicts