Solution and Improvements