changed token and item keys, also wrapped for multiple items