Added proper solution