restructured commit
Restructured code with overflowing queue