New version with working card play