upgrading through and using queue instead of emit
0.2.0 upgrades through and uses queue