added france refactored all