Added hack to both world and country