Added international logic