Some card stuff, model changes