Finsihed DigitDataExtras - Many other changes