queue system added, cleared formatting