implemented token as GET arg logic FULL