Updated for newer version of rust