added Locator and PriorityQueue