rebuild on token