license and code tweaking  to accept international format