Additional changes to boundary response