merging with develop
Made card declaration more explicit to avoid confusion