added Angela's new location module