Improved [Contactless] Card Security

Maybe should be merged into: