Added a possible solution, need to improve