add queue, need to fix loiter