matching up to the new_dev wiki page