Upgraded to latest Rust-Empty