Changed boundary conditions to inheritance model