fixed headcount, added queue system