keys functionality changed