Refactored and new problem added.