Further modifications to queue