changes to allow expired tokens