save token correctly
save properly