update to match final_dev branch