Still trying to fix the keys