Use session vars instead