Includes mwerezak's fore solar area changes.