Fix bug and add cards