diff --git a/src/reactmicp/reactmicp_chloride.hpp b/src/reactmicp/reactmicp_chloride.hpp
index c0928b5..142bb48 100644
--- a/src/reactmicp/reactmicp_chloride.hpp
+++ b/src/reactmicp/reactmicp_chloride.hpp
@@ -1,55 +1,56 @@
 /* =============================================================================
 
  Copyright (c) 2014-2017 F. Georget <fabieng@princeton.edu> Princeton University
  Copyright (c) 2017 F. Georget <fabien.georget@epfl.ch> EPFL
  All rights reserved.
 
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
     1. Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
 
     2. Redistributions in binary form must reproduce the above copyright notice,
     this list of conditions and the following disclaimer in the documentation
     and/or other materials provided with the distribution.
 
     3. Neither the name of the copyright holder nor the names of its
     contributors may be used to endorse or promote products derived from this
     software without specific prior written permission.
 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
 
 ============================================================================= */
 
 //! \file reactmicp_chloride.hpp
 //! \brief ReactMiCP system for advection-diffusion with species-dependent
 //! diffusion coefficients
 
 #ifndef SPECMICP_REACMICP_CHLORIDE_HPP
 #define SPECMICP_REACMICP_CHLORIDE_HPP
 
 // Core files
 
 #include "reactmicp_core.hpp"
 
 // System
 
 #include "reactmicp/systems/chloride/variables.hpp"
-#include "reactmicp/systems/chloride/init_variables.hpp"
+//#include "reactmicp/systems/chloride/init_variables.hpp"
 
+#include "reactmicp/systems/chloride/boundary_conditions.hpp"
 #include "reactmicp/systems/chloride/transport_stagger.hpp"
 #include "reactmicp/systems/chloride/equilibrium_stagger.hpp"
 
 
 #endif // SPECMICP_REACMICP_CHLORIDE_HPP
diff --git a/src/reactmicp/systems/chloride/CMakeLists.txt b/src/reactmicp/systems/chloride/CMakeLists.txt
index ae40aad..8d975e0 100644
--- a/src/reactmicp/systems/chloride/CMakeLists.txt
+++ b/src/reactmicp/systems/chloride/CMakeLists.txt
@@ -1,37 +1,38 @@
 set( reactmicp_chloride_srcs
     variables.cpp
     variables_interface.cpp
 
     boundary_conditions.cpp
 
     transport_program.cpp
     #jacobian_approximation.cpp
     transport_stagger.cpp
 
     equilibrium_stagger.cpp
 )
 
 set( reactmicp_chloride_headers
+    init_variables.hpp
     variables.hpp
     variablesfwd.hpp
     variables_interface.hpp
     dof_numbering.hpp
 
     boundary_conditions.hpp
 
     transport_program.hpp
     transport_program_struct.hpp
     #jacobian_approximation.hpp
     transport_stagger.hpp
 
     chem_stagger_base.hpp
     equilibrium_stagger.hpp
 )
 
 add_to_reactmicp_srcs_list(reactmicp_chloride_srcs)
 add_to_reactmicp_headers_list(reactmicp_chloride_headers)
 
 INSTALL(FILES ${reactmicp_chloride_headers}
     DESTINATION ${INCLUDE_INSTALL_DIR}/reactmicp/systems/chloride
 )
 
diff --git a/src/reactmicp/systems/chloride/init_variables.hpp b/src/reactmicp/systems/chloride/init_variables.hpp
new file mode 100644
index 0000000..e69de29