Use better card control