updated key loading
updated key loading and rebuilt