Updated code for more recent rust