added keys and shit