Added new solution to replace old