debugged boundary conditions and last changes