Changes to get parallel window working correctly.