[bugged] change key data structure