Close #90 Close #191 Close #196  --- Pivot issues.