Added boundary conditions