token issue not resolved but code modified