Issue 1: Change Queue to LinkedHashSet