updated keys and stuff