Change boundary condition module radically