updated names to be global