Updated to the fresh Rust