Merged my use of the setup keys with johns