General updates to working solution