Another update for set boundary conditions mode