updated to work with rust-dev changes