Token saving working