Keys updated, with more up to date js reference