Removed queue, added headers magic