added card and change money bugfix from master