Serious modifications to the DataCardCreator so switching to a clean area