updated key setup