add the non euro function and update other issues