Adding active_card stuff back