Changed the approach for previous commit