Updates to deal with split cards