more work on boundaries