More changes to get closer to Rust code
tmp