Try to simplify
Fix merge
Use XYZ for boundaries