Removed commented out method and added a null check to the new Solve overload