last second swap.. fml
Merge pull request #645 from agoddard/portland

last second swap.. fml