removed new dirichlet conditions from this branch