Updated for international installation