Added a flag to preserve the original token