Reverted back to the key hack