Re-added boundary condition code and broke the build