Changed update cards
Merge branch 'finalstages' of github.com:tonglil/zap into finalstages