Improved card drawing