After changing to stack and queue headers