several changes overall. hiding key