State resets properly implemented, in-between cards added