Updating how we untar