Changes to cardmap to try and make new code work.