Pull SSA changes

First request to pull my changes