changed a bit more regarding the key