take out extra japan rules and crap
add france