made token stores way better