updated work with regional settings