Added working solution