Added whole solution