fixed country and refactured