Datacards code updated - close to final