Updated keys
more clean