more adjustments to boundary types; need to consult