Updated versions for the things we use