Added new working solution