Erik. Boundary conditions rewritten/