Multiple changes on way to working solution