Updated to have all cards and formatted them properly