Commit 92

Trying to improve boundary code.