Tests done
fix update remaining cards on subs done