make keys work finally